From: bors <bors@rust-lang.org>
Date: Fri, 29 Apr 2016 17:15:47 +0000 (-0700)
Subject: Auto merge of #2623 - alexcrichton:nfs-lol-no, r=brson
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~14^2~34
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=27161ec54540acec41280b5c715058e3c238dfaf;p=cargo.git

Auto merge of #2623 - alexcrichton:nfs-lol-no, r=brson

Don't use flock on NFS mounts

Completely skip file locking when we detect an NFS mount via `statfs`.

Closes #2615
---

27161ec54540acec41280b5c715058e3c238dfaf